319. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:07 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

319.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_sections.less2015-11-30 20:21:30 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_sections.less2021-02-02 14:32:48 +0000

319.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged11120
Changed3148
Inserted491
Removed317

319.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

319.4 Active regular expressions

No regular expressions were active.

319.5 Comparison detail

1 // /** 1 // /**
2 //  * Copyright © 2015 Magento. All rights reserved. 2 //  * Copyright © 2015 Magento. All rights reserved.
3 //  * See COPYING.txt for license details. 3 //  * See COPYING.txt for license details.
4 //  */ 4 //  */
5  5 
6 // 6 //
7 //  Common 7 //  Common
8 //  _____________________________________________ 8 //  _____________________________________________
9  9 
10 & when (@media-common = true) { 10 & when (@media-common = true) {
11     .product.data.items { 11   .product.data.items {
12         .lib-data-accordion(); 12       .lib-data-accordion();
13         border-bottom: @tab-control__border-width solid @tab-control__border-color;    
14         margin-bottom: @indent__base;    
15         margin-left: -@layout__width-xs-indent;    
16         margin-right: -@layout__width-xs-indent;    
17         .item.title { 13       .item.title {
    14           color: #818692;
    15           padding: 15px 0;
    16           font-weight: 700;
    17           text-transform: uppercase;
    18           background: none;
    19           border-bottom: 2px solid #e7e7e7;
    20           >.switch {
    21             font-size: 13px;
    22             display: inline-block;
    23             border: none;
    24             height: auto;
    25             padding: 0 !important;
    26             color: inherit;
    27             font-weight: inherit;
    28             line-height: inherit;
    29             background: none !important;
    30             display: block;
    31             &:hover {
    32               color: inherit;
    33               background: none;
    34             }
    35           }
    36           &.active {
    37             color: #222529;
    38             border-color: #222529;
    39             >.switch {
    40               color: inherit;
    41               background: none;
    42               padding: 0;
    43               &:hover,&:focus {
    44                 padding: 0;
    45                 color: inherit;
    46                 background: none;
    47               }
    48             }
    49           }
    50           &:hover {
    51             border-color: #222529;
    52             color: #222529;
    53             >.switch {
    54               color: inherit;
    55               padding: 0;
    56             }
    57           }
18             a { 58           a {
19                 position: relative; 59               position: relative;
20                 .lib-icon-font(    
21                     @_icon-font-content: @icon-down,    
22                     @_icon-font-size: @font-size__base,    
23                     @_icon-font-line-height: @icon-font__line-height,    
24                     @_icon-font-color: @icon-font__color,    
25                     @_icon-font-color-hover: @icon-font__color-hover,    
26                     @_icon-font-color-active: @icon-font__color-active,    
27                     @_icon-font-margin: @icon-font__margin,    
28                     @_icon-font-vertical-align: @icon-font__vertical-align,    
29                     @_icon-font-position: after,    
30                     @_icon-font-display: false    
31                 );    
32                 &:after { 60               &:after {
    61                   font-family: 'porto-icons';
    62                   content: @icon-down;
33                     position: absolute; 63                   position: absolute;
34                     right: @accordion-control__padding-right; 64                   right: @accordion-control__padding-right;
35                     top: @accordion-control__padding-top; 65                   top: @accordion-control__padding-top;
36                 } 66               }
37             } 67           }
38             &.active a:after { 68           &.active a:after {
39                 content: @icon-up; 69               content: @icon-up;
    70               font-family: 'porto-icons';
    71           }
    72       }
    73       > .item {
    74           &.content {
    75             border: none;
    76             box-shadow: none;
    77             padding: 30px 0 15px;
    78             background: none;
    79             p {
    80               font-size: 14px;
    81               font-weight: 400;
    82               letter-spacing: .005em;
    83               line-height: 1.9;
    84             }
40             } 85           }
41         } 86       }
42         .value p:last-child { 87       .value p:last-child {
43             margin-bottom: 0; 88           margin-bottom: 0;
44         } 89       }
45         .table-wrapper { 90       .table-wrapper {
46             margin: 0; 91           margin: 0;
47         } 92       }
48     } 93   }
    94   .porto-info-list,.product.description ul {
    95     padding-left: 38.5px;
    96     margin-bottom: 20px;
    97     li {
    98         list-style: none;
    99         line-height: 1.5;
    100         padding-top: .5em;
    101         padding-bottom: .5em;
    102         margin: 0;
    103         display: -ms-flexbox;
    104         display: flex;
    105         -ms-flex-align: center;
    106         align-items: center;
    107     }
    108     .porto-info-icon, [class^=porto-icon-] {
    109         margin-right: 16.5px;
    110         line-height: 1.3;
    111         position: relative;
    112         top: 2px;
    113         color: #21293c;
    114         font-size: 16px;
    115     }
    116     .porto-icon-ok:before {
    117       content: '\e8c1';
    118     }
    119     .porto-info-list-item .porto-info-icon {
    120         width: auto;
    121         display: inline-block;
    122     }
    123   }
49 } 124 }
50  125 
51 // 126 //
52 //  Desktop 127 //  Desktop
53 //  _____________________________________________ 128 //  _____________________________________________
54  129 
55 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 130 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
56     .product.data.items { 131     .product.data.items {
57         .lib-data-tabs(); 132         .lib-data-tabs();
58         border-bottom: 0; 133         border-bottom: 0;
59         margin-left: 0; 134         margin-left: 0;
60         margin-right: 0; 135         margin-right: 0;
61         .item.title a:after { 136         .item.title a:after {
62             display: none; 137             display: none;
63         } 138         }
64             
65         > .item { 139         > .item {
66             &.title { 140             &.title {
67                 margin: 0 1px 0 0; 141                 margin: 0 35px 0 0;
68                  142                 color: #818692;
69                 > .switch { 143                 padding: 7px 0;
70                     font-size: 14px; 144                 font-weight: 700;
71                     border: 1px solid @tab-control__border-color; 145                 text-transform: uppercase;
72                     border-top-width3px; 146                 background: none;
73                     border-bottom-width: 0; 147                 border-bottom: 2px solid transparent;
74                     border-radius: 5px 5px 0 0; 148                 >
.switch {
75                     line-height: 30px; 149                   font-size: 13px;
76                     padding: 1px 15px 1px 15px; 150                   display: inline-block;
    151                   border
none;
    152                   height: auto;
    153                   padding: 0 !important;
    154                   color: inherit;
    155                   font-weight: inherit;
    156                   line-height: inherit;
    157                   background: none !important;
    158                   display: block;
    159                   &:hover,&:active,&:focus {
    160                     color: inherit !important;
    161                     border-color: inherit  !important;
    162                     background: none;
    163                   }
77                 } 164                 }
78                 &.active { 165                 &.active {
79                     > .switch { 166                   color: #222529;
80                         &, &:focus, &:hover { 167                   border-color: #222529;
81                             border-top-color: @theme-color; 168                   >
.switch {
82                             color: @theme-color; 169                     color: inherit;
    170                     background: none;
    171                     padding: 0;
    172                     &:hover,&:focus {
    173                       padding: 0;
    174                       color: inherit;
    175                       background: none;
    176                     }
    177                   }
    178                 }
    179                 &
:hover {
    180                   border-
color: #222529;
    181                   >.switch {
    182                     color: inherit;
    183                     padding: 0;
    184                   }
    185                 }
    186             }
    187             &.content {
    188               border: none;
    189               border-top: solid 1px #e7e7e7;
    190               box-shadow: none;
    191               padding: 30px 0 15px;
    192               margin-top: 40px;
    193               background: none;
    194             }
    195         }
    196         .vertical & {
    197           > .item {
    198             &.title {
    199               max-width: 20%;
    200               text-align: left;
    201               float: none;
    202               border: none;
    203               padding: 0;
    204               margin: 0;
    205               margin-bottom: 13px;
    206               overflow: hidden;
    207               position: relative;
    208               >.switch {
    209                 padding: 3px 0 10px !important;
    210                 display: inline-block;
    211                 &::before {
    212                   content: '';
    213                   position: absolute;
    214                   width: 100%;
    215                   bottom: 0;
    216                   border-bottom: 1px solid #dae2e6;
    217                   z-index: 1;
    218                 }
    219                 &::after {
    220                   content: '';
    221                   display: block;
    222                   position: absolute;
    223                   width: 30vw;
    224                   bottom: 0;
    225                   border-bottom: 1px solid #dae2e6;
    226                   z-index: 0;
    227                   left: 0;
    228                 }
    229               }
    230               &.active,&:hover {
    231                 >.switch {
    232                   &::before {
    233                     border-width: 2px;
    234                     border-bottom-color: inherit;
83                         } 235                   }
84                     } 236                 }
85                 } 237               }
86             } 238             }
87             &.content { 239             &.content {
88                 margin-top35px; 240               position: absolute;
89                 border-color: @tab-control__border-color; 241               float: none;
90                 box-shadow: 0 1px 2px #eee; 242               margin
0;
    243               width: 80%;
    244               right: 0;
    245               top: 0;
    246               padding-top: 0;
    247               border-top: none;
    248               padding-left: 30px;
    249               min-height: 180px;
    250             }
    251           }
    252         }
    253         .accordion & {
    254           & > .item.title {
    255             border-color: #e7e7e7;
    256             &.active {
    257               border-color: inherit;
    258             }
    259           }
    260           & > .item.title, & > .item.content {
    261               float: none;
    262               margin: 0;
    263               display: block;
    264           }
    265           & > .item.content {
    266             border: none;
    267           }
    268         }
    269         .sticky & {
    270           & > .item.title {
    271             &.active {
    272               color: inherit;
    273               border-color: transparent;
    274             }
    275             &:hover {
    276               color: inherit;
    277               border-color: inherit;
    278             }
91             } 279           }
92         } 280         }
93     } 281     }
94 } 282 }